Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Mon, 4 Nov 2013 17:50:20 +0000 (17:50 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Mon, 4 Nov 2013 17:50:20 +0000 (17:50 +0000)
commit68bd172e6fa565899c846eb72755c8ffd8562c8a
tree48c2df28fff496e1a717b18dde552dd6abd47a6e
parentd641f428533e0d1232c1d1646263a8f5f430ca50
parent77b590e41517c7409ab841238683e861acc528dd
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging